Merge branch 'master' of https://github.com/rust-lang/cargo into allow-examples-to...

diff --cc src/cargo/core/manifest.rs
Simple merge

diff --cc src/cargo/ops/cargo_compile.rs
Simple merge

diff --cc src/cargo/ops/cargo_rustc/context.rs
Simple merge

diff --cc src/cargo/util/toml.rs
Simple merge